More ProjectRassilon fixes