Minor changes to Titan for better invocation from Faunus.