Buildfixes for XACT merge.