CORE-3866: added some null constraints