Fix dialyzer warnings introduced by this branch