Changes to some forked stuff