[jvstm-lf] Updates just to allow compilation with JVSTM 2