Fix fc19 compilation errors