minor changes because of some dep. not in maven central