Small fixes to make besh work again
Merge pull request #232 from Wobbo/master

Small fixes to make besh work again