Minor fixes for Lulu, interactive cases not working yet.
This will create a new commit in order to revert the existing changes.
