Fixes after merge #2