Fix some future stuff