more marginal fixes