Fix type issues in some actions