Made HWA width fixes