Fixing two small bugs - v0.1.2