More OA tweaks