Feature net bugfixes