some fixes

Josh, your stuff was changed as well. I am not sure if we want to keep
your changes along with Joshes.