Fixed NPEs
Fixed PM showing target name