More fixes for 0.14