Error fixes (first sprint)
Merge origin/develop into develop