cleared a couple more warnings