Image radio fixes and waiting hack