Minor fixes + default site configuration