[20161206211458] AMI updates and bug fixes