Another small fix.
Milestone commit: the refactorings are now done, time to start fixing some bugs :-)