some entry script fixes
Merge branch 'dev' of https://github.com/SergiyYarinovskiy/rb into dev