Final fixes for 0.3.0