Added missing push/pop data_environment in 501 and 509.