Fixed a couple of warnings. Still some remaining which will take more than a minute to resolve.