Some fixes for 5.3