Fixes/Comments for Release 3.6