Fixing gameplay bugs