diff --git a/src/java/azkaban/project/ProjectManager.java b/src/java/azkaban/project/ProjectManager.java
index f610e40..e718921 100644
--- a/src/java/azkaban/project/ProjectManager.java
+++ b/src/java/azkaban/project/ProjectManager.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -178,7 +179,7 @@ public class ProjectManager {
projectLoader.updatePermission(newProject, creator.getUserId(), new Permission(Permission.Type.ADMIN), false);
// Add proxy user
- newProject.getProxyUsers().add(creator.getUserId());
+ newProject.addProxyUser(creator.getUserId());
try {
updateProjectSetting(newProject);
} catch (ProjectManagerException e) {
diff --git a/src/java/azkaban/webapp/servlet/ScheduleServlet.java b/src/java/azkaban/webapp/servlet/ScheduleServlet.java
index 7dcc6ab..764374f 100644
--- a/src/java/azkaban/webapp/servlet/ScheduleServlet.java
+++ b/src/java/azkaban/webapp/servlet/ScheduleServlet.java
@@ -547,10 +547,11 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
} else {
day = DateTimeFormat.forPattern("MM/dd/yyyy").withZone(timezone).parseDateTime(scheduleDate);
}
+
+ hour %= 12;
- if(isPm && hour < 12)
- hour += 12;
- hour %= 24;
+ if(isPm)
+ hour += 12;
DateTime firstSchedTime = day.withHourOfDay(hour).withMinuteOfHour(minutes).withSecondOfMinute(0);
