Minor struct changes