Commit before fixes