Address the following reviews: https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145978 https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145980 https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145981