Forgotten commits for 0.9.1