Last fixes and exclude tag builds