Architecture listing inline fixes. Kamil's partial excluded because of compilation errors.