Runtime fixes, tweaks.