Forked project fixes