Just simple fixes
Merge pull request #171 from Gioyik/lacks

Just simple fixes