Brought back build fixes for f12, which apparently got lost in the svn-git move