Minor bugs fixes
Merge branch 'master' of github.com:TeamSBK/Glass