fixing things after F20 upgrade