Fixes for everything