More fix and clean up