Fix some specific PM commands not working.