Fixed log messages
Proper locking enabled