* Fixed pong synchronization issue * Minor optimization in lock by scoping it to necessary changes. * Fixing compilation issues