Bugs/iap polishing

@kaushikkhatua Please review