Forked app fixes