WIP: small changes to simplify deployment for hf needs