Fixes and stuff