minor fixes for things I removed yesterday