Outlets and light switches

One room in my new house has exactly one outlet, and it's controlled by the light switch. I don't want it to be.

Another room in my house has exactly one light (in the ceiling fan) and it isn't controlled by the light switch. I want it to be.

Is there a straightforward way to fix these issues?