eliminated a few warnings