Fix instaweb support

Closes #571.