Fixing things from suggestions