Add support process check. Some small fixes