fixes for jaot project