Resolve last bugs for version 0.7