minor fixes
merge fix
before montenegro