Minor fixes (class abstractness and unused imports)