Fixes, moar fixes