Interpolate performance

Set of small performance improvements