Fix creation of new resources and buffering data