misc fixes for 0.1