Fixes to get sk-test passing