Minor fixes and such