Fixed some Dialyzer found issues