Some final changes for 0.4-5