Make the ready functions work a little better