AMD64 - Fix minor issues.