Fix for embed and freeze which were broken by #216.