Better job and block template object handling. Some address validation