Some fixes to some substitutinos