Fix #3 issues