Fixed import & some config fixes