Fixing some solutions and pre processor variables