Fix Periodic and Limited instances