Small fixes Before Demo