Further frontend improvements