post approval fixes