Fixes related to backporting to WP3.0