required changes for 3.6 beta 1
various fixes