Fix edit parent, modal entires
Add skip wakeup options to goc