Minor fixes and added world lock for non-broadcast messages