Fix some simple type annotation issues

Reviewers: claus.due, #forgetit-dev, dkd-doan

Reviewed By: #forgetit-dev, dkd-doan

Differential Revision: https://phabricator.dkd.de/D477