A few random fixes and changes