Updates to latest Alchemy 3 master