Minor corrections and clean up