- Fixes for 5.4.7