Resolved couple of warnings and minor changes