[PATCH Audrey] Address packaging issues