Fixes and things