[NCuboid] Additional fixes