Fix errors

Fix the errors in the code

assigned to @bmcandre

mentioned in merge request !1 (merged)

mentioned in commit 9e7607fa

closed with merge request !1 (merged)

mentioned in merge request !2 (merged)

mentioned in commit 5db97e43

Merged at 5db97e43

merged at 5db97e43

reopened

closed