Fixes, finally