Added some sanity do-whiles