Fixed bugs in resolution using imports/aliases.