PM / network fixes