Various little corrections