Several bugs fixes through the site