Fix rack startup errors

And miscellaneous cleanup