0.0.2: Fix some bugs