Several fixes and new Maven artifacts