Fixes and updates for OF 0.9.0