hotfixes for the 0.7 release