Various small things since the last commit