Fixes for OF 0.9.0 (master branch), code formatting