more no continue fixes