Merge some changes from 1.0.4. Very odd.