Fix going through wall and porting