Fixed minor import problems.
Merge branch 'dev' to fix some minor bugs.