sructural fixes