Merging fixes from debug branch