Fix minor nitpicks