Remove some warnings that were introduced by commit 6ca440c