couple more bodystructure related fixes