diff --git a/libvcs4j-api/src/main/java/de/unibremen/informatik/st/libvcs4j/FileChange.java b/libvcs4j-api/src/main/java/de/unibremen/informatik/st/libvcs4j/FileChange.java
index 48838fb..3b058fb 100644
--- a/libvcs4j-api/src/main/java/de/unibremen/informatik/st/libvcs4j/FileChange.java
+++ b/libvcs4j-api/src/main/java/de/unibremen/informatik/st/libvcs4j/FileChange.java
@@ -69,10 +69,10 @@ default Type getType() {
 		Validate.validateState(old.isPresent() || nev.isPresent(),
 				"Neither the old nor the new file is available");
 
-		if (!old.isPresent()) {
+		if (old.isEmpty()) {
 			return Type.ADD;
 		}
-		if (!nev.isPresent()) {
+		if (nev.isEmpty()) {
 			return Type.REMOVE;
 		}
 		return old.get().getRelativePath()
diff --git a/libvcs4j-api/src/main/java/de/unibremen/informatik/st/libvcs4j/RevisionRange.java b/libvcs4j-api/src/main/java/de/unibremen/informatik/st/libvcs4j/RevisionRange.java
index f072eea..14fa72a 100644
--- a/libvcs4j-api/src/main/java/de/unibremen/informatik/st/libvcs4j/RevisionRange.java
+++ b/libvcs4j-api/src/main/java/de/unibremen/informatik/st/libvcs4j/RevisionRange.java
@@ -386,7 +386,7 @@ default List<Issue> getIssues() {
 	 * 		otherwise.
 	 */
 	default boolean isFirst() {
-		return !getPredecessorRevision().isPresent();
+		return getPredecessorRevision().isEmpty();
 	}
 
 	/**
diff --git a/libvcs4j/src/main/java/de/unibremen/informatik/st/libvcs4j/VCSEngineBuilder.java b/libvcs4j/src/main/java/de/unibremen/informatik/st/libvcs4j/VCSEngineBuilder.java
index cbd69eb..a197ad1 100644
--- a/libvcs4j/src/main/java/de/unibremen/informatik/st/libvcs4j/VCSEngineBuilder.java
+++ b/libvcs4j/src/main/java/de/unibremen/informatik/st/libvcs4j/VCSEngineBuilder.java
@@ -695,7 +695,7 @@ private LocalDateTime parseDateTime(final String pDateTime,
 		} catch (final ParseException ignored) { /* try next */ }
 		try {
 			final int year = Integer.parseInt(pDateTime);
-			return LocalDateTime.of(year, 0, 0, 0, 0);
+			return LocalDateTime.of(year, 1, 1, 0, 0);
 		} catch (final NumberFormatException |
 				DateTimeParseException ignored) { /* try next */ }
 		throw new IllegalArgumentException(String.format(
diff --git a/libvcs4j/src/main/java/de/unibremen/informatik/st/libvcs4j/engine/AbstractVSCEngine.java b/libvcs4j/src/main/java/de/unibremen/informatik/st/libvcs4j/engine/AbstractVSCEngine.java
index 74d4a20..cfdad75 100644
--- a/libvcs4j/src/main/java/de/unibremen/informatik/st/libvcs4j/engine/AbstractVSCEngine.java
+++ b/libvcs4j/src/main/java/de/unibremen/informatik/st/libvcs4j/engine/AbstractVSCEngine.java
@@ -212,7 +212,7 @@ public RevisionRange next() {
 				try {
 					final Optional<RevisionRange> range =
 							AbstractVSCEngine.this.next();
-					if (!range.isPresent()) {
+					if (range.isEmpty()) {
 						throw new NoSuchElementException();
 					}
 					return range.get();