Fixed some issues found during bootstrap UI conversion.