Minor fixes after move