Fix NetworkOnMainThread exception for newer versions and some minor stuff...