Crapton more bug fixes.