Fix problems with imports validation