another batch of jscs fixes