Little fixes where I had messed up before.