Various fixes on pbs+maui role