Fix minor violations