minor cleanup fixes