Some last fixes to 0.2.1