Issue fixes for 5.12