fixes for stuff