Fixed #2 and #4