Fixes and Stuff

A collection of small repairs.