Fix some weirdness
Update changelog