mirno fixes
minor fixes