Final fixes for 0.2 release