Fixes for 0.2 release
Fixes for 0.2 release