Omnify + Fixes