Resolve application problems

Replace the components properly.