diff --git a/ChangeLog b/ChangeLog
index 5bb17e7..942eb24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-15 Sergii Stoian <stoyan255@gmail.com>
+	
+	* Framework/PCProjectBuilder.m:
+	(-startBuild:), (-startClean:): Move _isBuilding and _isCleaning vars
+	before build: method call for correct determination in cleanupAfterMake
+	method.
+	(build:): Initialize build time vars before call to preBuildChecj 
+	method.
+	* Framework/PCProjectBuilderOptions.m: Do not notify when changing 
+	project properties (build options).
+
 2009-03-31 Riccardo Mottola <rmottola@users.sf.net>
 	
 	* PCSplitView: removed and replaced with standard NSSplitView in all instances
diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m
index 2378363..eb2df27 100644
--- a/Framework/PCProjectBuilder.m
+++ b/Framework/PCProjectBuilder.m
@@ -388,8 +388,8 @@
   buildStatus = [NSString stringWithString:@"Building..."];
   [buildStatusTarget setString:@"Build"];
   [cleanButton setEnabled:NO];
-  [self build:self];
   _isBuilding = YES;
+  [self build:self];
 }
 
 - (void)startClean:(id)sender
@@ -418,8 +418,8 @@
   buildStatus = [NSString stringWithString:@"Cleaning..."];
   [buildStatusTarget setString:@"Clean"];
   [buildButton setEnabled:NO];
-  [self build:self];
   _isCleaning = YES;
+  [self build:self];
 }
 
 - (BOOL)stopMake:(id)sender
@@ -464,21 +464,21 @@
     {
       [buildButton setState:NSOffState];
       [cleanButton setEnabled:YES];
+      _isBuilding = NO;
     }
   else if (_isCleaning)
     {
       [cleanButton setState:NSOffState];
       [buildButton setEnabled:YES];
+      _isCleaning = NO;
     }
 
   [buildArgs removeAllObjects];
   [buildStatusTarget setString:@"Default"];
 
+  // Initiated in [self build:]
   [currentBuildPath release];
   [currentBuildFile release];
-
-  _isBuilding = NO;
-  _isCleaning = NO;
 }
 
 // --- Actions
@@ -555,6 +555,12 @@
 
 - (void)build:(id)sender
 {
+  // Make runtime vars
+  // Released in [self cleanupAfterMake]
+  currentBuildPath = [[NSMutableString alloc] 
+    initWithString:[project projectPath]];
+  currentBuildFile = [[NSMutableString alloc] initWithString:@""];
+
   // Checking build conditions
   if ([self prebuildCheck] == NO)
     {
@@ -562,11 +568,6 @@
       return;
     }
 
-  // Make runtime vars
-  currentBuildPath = [[NSMutableString alloc] 
-    initWithString:[project projectPath]];
-  currentBuildFile = [[NSMutableString alloc] initWithString:@""];
-
   // Prepearing to building
   _isLogging = YES;
   stdOutPipe = [[NSPipe alloc] init];
@@ -645,7 +646,7 @@
       return;
     }
 
-  NSLog(@"task did terminate");
+//  NSLog(@"task did terminate");
 
   [NOTIFICATION_CENTER removeObserver:self 
 			         name:NSTaskDidTerminateNotification
diff --git a/Framework/PCProjectBuilderOptions.m b/Framework/PCProjectBuilderOptions.m
index 642ce65..55a5093 100644
--- a/Framework/PCProjectBuilderOptions.m
+++ b/Framework/PCProjectBuilderOptions.m
@@ -143,7 +143,7 @@
   [args removeObject:@""];
   [args removeObject:@" "];
 
-  [project setProjectDictObject:args forKey:PCBuilderArguments notify:YES];
+  [project setProjectDictObject:args forKey:PCBuilderArguments notify:NO];
 
   [delegate targetDidSet:[targetPopup titleOfSelectedItem]];
 }
@@ -162,7 +162,7 @@
   if (sender == sharedLibsButton)
     key = PCBuilderSharedLibs;
 
-  [project setProjectDictObject:value forKey:key notify:YES];
+  [project setProjectDictObject:value forKey:key notify:NO];
 }
 
 - (void)loadProjectProperties:(NSNotification *)aNotif