General clean up and fixes before 2.5 release