Fix #2 and #3