Fix some isses for reviewboard.

https://git.reviewboard.kde.org/r/109021/