Minor fixes based on the latest Sling Launchpad