diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 71676e1..9a783e8 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -1786,10 +1786,6 @@ bool GParted_Core::change_uuid( const Partition & partition, OperationDetail & o
 				succes = set_proper_filesystem( partition .filesystem ) &&
 					 p_filesystem ->write_uuid( partition, operationdetail .get_last_child() ) ;
 				break ;
-#ifndef HAVE_LIBPARTED_3_0_0_PLUS
-			case FS::LIBPARTED:
-				break ;
-#endif
 
 			default:
 				break;
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 8b014bb..e88d531 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -1035,12 +1035,12 @@ void Win_GParted::set_valid_operations()
 		if ( selected_partition .status == GParted::STAT_REAL && fs .copy )
 			allow_copy( true ) ;
 		
-		//allow labelling of all partitions that support labelling
-		if ( fs .write_label )
+		//only allow labelling of real partitions that support labelling
+		if ( selected_partition .status == GParted::STAT_REAL && fs .write_label )
 			allow_label_partition( true ) ;
 
-		//allow changing uuid of file systems that support it
-		if ( fs .write_uuid )
+		//only allow changing UUID of real partitions that support it
+		if ( selected_partition .status == GParted::STAT_REAL && fs .write_uuid )
 			allow_change_uuid( true ) ;
 
 		if ( selected_partition .get_mountpoints() .size() )
