Fixes for 3.5 beta