Fixed rebuilds