Fixup on local platform and add logging