Compilation fixes for 0.7.1