[Fixing errors]

Fix imports and other couple of details