Cleanup some errors that crept into last night's debugging - still have linkage problem that Jeff is investigating