Fixes for 5.6.2