edwindj fixed warning issues