Fix some style and import issues