frontend-fixups