Couple of fixes + changelog doc