Revert "Fix some warnings"

This reverts commit b25dc89d2f66fb58ca14f280757b2e8ff164a94b.