Fix issues from initial python tests