Fix Main some more