fixes in omnibus