Fixed some stuff with resource and share handling