Minor bugs which prevent standalone build in the 1.2 version