More fixes for nexis sempai