Proto app bugfixes