Corrections to make UI work.