Fixed #2 and #3