Old apps fixes