Fixes for stuff.