Fixed up a few packages, imports and syntax errors