Intermediate fixes for 0.9.5.1 release