Few fixes
fixes