Fix overlooked issues from the v1.0 release
Things that are being considered but not yet decided upon.