Multiple minor fixes

Mainly for local file move