Fixed some issues with VBO