Fixed few errors, fixed imports