Resolved #4 and #16