Bring fixes to bytype