Compile issues after F27 -> F28 upgrade