Bug fixes and various stuff I can't remember.