Minor improvements

Should be pretty self-explanatory.