removed a couple of warning