Fixes before 0.0.1