Fixed #1 and #4