More small fixes
Merge pull request #3 from subzey/fixes-2

More small fixes