other fixes
Merge pull request #822 from AndreiCurelaru/master

other fixes