Various fixes based on namcap recommendations