Some fixes

Yay, fixes