Just some last minute changes before Alpha