fixes for everything