Fixing some of the things