Fix fixity problems