Fixes to get working with 0.14