Fixes

I figure this should fix some stuff