Fix fault handlers