Fix a couple of bugs
update changelog