Linearisation code build for optimised version, small changes