Fixes to more usings...I hate maven