Some minor fixes from masterclass
Merge branch 'anapa-fixes' of https://github.com/trikset/trikRuntime