Fixed up ready handling some more