Fixing last commit inconsistencies