Merge changes from John Hixson and FreeNAS work