Fixes for 3.0.66-rc1