Misc fixes

Mostly timeouts and misc naming things.