Fix up flight/fire patterns, switch to meta source control version