Modifications so inital template install works