Minor runtime fixes