Fixes stuff