Minor Fixes after merge.