Bug fixes | Lith MS2