Fixes

Hopefully I am doing this right now.