Fixes to make the library compilable with Maven