More Bug Fixes

I'm trying, guys.