minor fixes to 0.8