Fixes for 4.6.60