Continued work on 2.2
Allow for older OS versions