Fixes small things pointed out by @minrk