Warnings cleanup ... finish up earlier commit