Logger and RW lock fixed