Bump version, catch a few last license inconsistencies