Progressing on new theory interface
Removed a few warnings