Additional debugging in select spots

to resolve issues reported by several users during build process.