Two issue resolved