Re-introduce mrOptions lens and fix warnings