Fixed what may have been a problem in package names that I introduced in last move. Squashed a compiler warning too