Add fixes to warper