I'm pretty sure these two changes were intended for this branch