Fixes to work on 0.90.0 full