Fixed minor bugs with PDS