Fixing Things

More fixing.