Previous commit with syncing introduced compilation errors which are now
corrected.