Fixes for Release 3.6