Minor fixes from observed behaviour in the public network

Including them all in a ticket since they're quite small.