Small corrections

Other small fixes