Fixed for zero-mass fixed links
Fixed to accept empty lists and maps
Resolved conflict, same change made on two machines