Fixes as per feedback from Antti.