Tweaking so that optional dependencies are properly handled