Fixed up #1 issues