Fixes development/testing in Ja