Fixes for Stuff