Fix minor packaging issues in automation lib