Minor fixes
More nitpicking