porting over some direct solver fixes