fixes, required by 2.1 spree