Move these two fixes to the 0.9.4 release