Odd fixes, cleanups
Warning fix