more structural fixes