Fixing @wasade comments