Resolve import problems