Committing old changes relating to OA support