Fix compilation issues due to the code dependency on weaved methods