Resource reservation fixes

Make sure they're clean up properly