fixes for 5.3.1