Fix future bugs.