A few more changes had to be made for sanity checks