Fixed a few imports to make sure maven downloads all the jars.