More Bug Fixes

Hopefully the end!