More compile fix with dependency detection.