master: fixed imports