Small fixes.
Merge branch 'Vadzim' of https://github.com/VadzimBura/GroupProject into Vadzim