fixed warning issues