Separated these ugly omnibus fixes to delete if fixed upstream