Fixed broken replacements and left out types