Make small fixes to prevent circular dependency problems.