fixup warning and error