Fix problems building Extras packages for FC3 and FC4