Added compiler switch and code changes for port