That was the same for me. I was studying econ and philosophy in A&S. Unless you started in the Engineering School as a Freshman, you simply wouldn't have enough time to get all the credits for a major there.

The best way to prepare for the job market though is to build things and publish them.

I do wish I could go back and pay more attention in the CS classes I did take.