Code cleaning
fixing warnings
Fixing warning
Merge branch 'next' into next-andres