Leave approval flow bugs fixed