Fixed warnings on handlers and unused variables.