Some attempts at fixing the gun offset issue