Fixed all applications so far