bugfixes to push to oaff