More VAO fixes