Runtime fixes.