Bite-sized additions

Small changes - not for release!