INT: Small component fixes.