Fix up some complex code