Fixed some doozies