Some (more) fixing
v0.2-alpha1