Fixed jar merge issues