got rid of few warnings