Further frontend fixes