fixes for 5.5