Fixes for 2.064