Small follow up fix to last commit + some comments