some fixes for stable work #1

Closed xepozz closed 7 years ago