Production bug fixes for 0411 SA Release