Fix up panics