Fixes due to more dognet limitations