Some small sanitations