PW: Some small changes