Added the last of the changes for 0.3.8.