More fixes
Merge branch '68' of github.com:Gizra/Gizra into 68