more fixes for 0.14