Minor error and UI fixes