BufferStorage and related changes