Misc - x86_64 port related changes

UCC git Repository :: git.ucc.asn.au