Updated fixes as described in change.log