More fixing and clean up