Several frontend fixes