A couple of warnings fixed