A few more things fixed up...