Fix for latest changes on the PlatformManager interface.

...ce.

Other minor improvements on code clarity.