Follow-up

Fixing small issues after merging changes.