Fix #1 and #2