Fix strings and build