Fix'n some things