Removed warnings on 64-bit systems. Updated flow.