Multiple fixes for pre-10