More Fixes after merge.