Fixes, hopefully