Fixes for 2.067