Fixes bugs for public users