Fixes after merge #1