Cleanups to fix warnings