Trying to resolve some weird dependency bugs