collapsed labels -> minor code conformance fixes