[Build] Fixed up Prepared solutions