fixes to compile in windows/vs10 qt creator 5.3.1