Update Amethyst to 0.8.4