Various changes and fixes to SLM to prepare for T6.5 webapp