Improved timeout handling
Fixed pxi resource registration