small_ocdev_improvements