Various fixes and such things