Fix for default namespace
Some changes (mostly related to checkin)