Fork friendly changes