Several changes I've been too lazy to commit for a while