Resolved a couple of warnings