Various bug fixes for 1.6 release