Some patches for things I'd like to change