0.2.2 Minor fixes