Fix little issues to be compatible with spree 2.2.0.beta