Fixed some issues on uli