tiny structural fixes