Some quick fixes and code style updates.