Fix problems.

This should make building from maven work now.