Fixing some assignments!