Fix base version
Imports cleanup