Fixes; kldiv is out of commission for now