Minor fixes
Update 0.09