Fixing Stuff up