Small changes to compile in Xcode - note that GDB does not work