A few fixes and improvements.

Also removed pm_unblock_me as it does not make sense.
Improvement in pm_urgent