Wrong itr filed

Hello,
I think I have commited a big blunder.
For AY 2014-2015 I had deductions only under 194J and was eligible for rebate, but unknowingly I filed ITR-4S. a friend of mine told I should have filed ITR-4 and not 4S. I have already filed but haven't poseted ITR-V. What are my options now. Should I wait for acknowledgement and then file Rectification?

Now on to AY 2015-2016 I have incomes under 194J and also regular salary, also eligible for rebate here, but again I filed ITR-4S instead of ITR-4 according to my friend. What are my options now?

Thank you. Your inputs are very much appreciated.