Fixed jbds urls + fixed modules