Fix issue 313 & 314
Merge pull request #1368 from 9rnsr/fix_imports

Fix issue 313 & 314 - Add necessary imports and fix FQN accesses