Fixes the easy stuff