'fixes' for ui