Further improvements to link interpreter