Minor Code Changes

No major functionality change, if at all.