other fixes after file move