Fixing some obvious problems

Well gee, I screwed that up.