Fix some Dialyzer bugs