Results buffer fixes