Fixes and stuffs