Fixes for stuff