Resolved issues with solution building