Small runtime fixes