Fixes after merge issue