Build after upgrading pelican & few other changes