Enable node checkin and minor bug fixes