Fixes and other stuff