Some improvements when alwaysbuffer is true, plus some more