Fixes to get dialyzer working.