Heh, merging diffs manually... Fixing stuff I broke.