Minor changes - fixes #1 #2