A few fixes and removed keys
Merge branch 'original/master'