Bugfixes

Curse network bugs!