More buffer fix stuff