Practice time in the crib as much as possible. Start all naps in the crib even if they end up being short to create a positive crib association.
A version of the sleep lady shuffle can also be really helpful at night!