Fixing unpropper changes