Fixing some bugs I did introduce. Now compiles clean