Resolved a couple of warnings and minor changes