Fix some errors
Merge pull request #357 from buddytex/InDev

Fix some errors