Update and Fix app