Swc 777 additional small fixes