removed couple of warning