Bug fixes to address previous changes in recent commits. Code compiles