Second small fixes