Packaging tweaks + ensure complete entropy request is fulfilled