Some small changes after seeing @dwaite's huge commit