My LO is in a cycle of waking up every 35-45 mins from his naps. I grab him and put him back down on me and that works a treat. I know this isn't the best (also stops me from being productive in that time). I don't mind this if it's a phase - I know their circadian rhythm changes around now anyway. He can't self settle back for a nap. Night time sleep is fine.