Small Fixes

Yay fixes