Next version, few fixes