Minor fixes post 0.2.2