fixes to crosswalk