Bug fix + no logging merges