Boateng and Waris return to full fitness