Fixed some minor bugs with amber setup.