Some small fixes after transfer