Updates to keep Kensaku insync with the latest Amza