Fixes for 5.3.