Bug fixes; remove need for oldie