Bring in changes before 1.0.5