Finished grace period, fixed some observer stuff