Bugs

The bugs are already taged (#82 and #90)