Fix minor issues 20141021

#13