Various updates (flex generate...)