Fixed PD spigot and amplitude issues