Fixes post-rebirth