* Minor fixes while debugging