Fixes for binary file movement