fix some dependency problems introduced with bom cr14