Minor fixes for 0.1-alpha