0.1 pre release fixes

Fixes for 0.1 release