Minor fixes for 0.2.2