Merge fixes...

I made booboo, fixed now! YAY!