Fix some strand issues