Fixes of some sort