Squashed circular dependency bugs