Make debug and warning logs more consistent