APP-570 MIsc fixes following examples testing