Fix commits 1/2
Fix commits 2/2