Warnings and minor issue work.