Fix issue when multistage ext is not used
Fix issue checking multiple servers for lock