Project conf + some fix