Fixed small problems for #1