Resolved: #10, #11, #12