Fixes after rebasing