Some improvements during bufferload