Minor fixes
Get rid of head of linked list checks