Fixing and other stuff