Runtime fixes