App code code fixes