Fix issues 1 and 3 on github issues tracker