Amalgamation tweaks