Some fixes that don't fix anything