Fix thrust bugs