Fixes and such