Fixed single node issues