Fixed compile issue and imports.