More .jj fixes