Fix up minor violations