Cleanup: fix warnings