Fixing some weird little regressions