Fix some stuff v0.0.1