Minor fixes and hanging issues