Fixed up mistakes