Simon and few fixes