Fix build breaks from latest goamz