Fixes based on feedback from Thomas