Solution fixes - Remove Any CPU