diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
index e86e6c7c..4539ec15 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
@@ -149,7 +149,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         @Override
         public void onRepeatModeChanged() {
             notifyChange(REPEAT_MODE_CHANGED);
-            // FixMe: Not sure about this:
+            // FIXME This call will be removed in a subsequent PR
             prepareNext();
         }
 
@@ -405,7 +405,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         queueHandler.sendEmptyMessage(LOAD_QUEUE);
     }
 
-    // FixMe: Move to QueueManager or not?
+    // FIXME This will be refactored and partly moved to QueueManager in a subsequent PR
     private synchronized void restoreQueuesAndPositionIfNecessary() {
         if (!queuesRestored && queueManager.getPlayingQueue().isEmpty()) {
             List<Song> restoredQueue = App.getDatabase().queueSongDao().getQueue(0);
@@ -593,7 +593,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         uiThreadHandler.post(runnable);
     }
 
-    // FixMe: Move to QueueManager or not?
+    // FIXME This will be refactored and partly moved to QueueManager in a subsequent PR
     public void openQueue(@Nullable final List<Song> playingQueue, final int startPosition, final boolean startPlaying) {
         if (playingQueue != null && !playingQueue.isEmpty() && startPosition >= 0 && startPosition < playingQueue.size()) {
             // it is important to copy the playing queue here first as we might add or remove songs later
diff --git a/app/src/main/java/com/dkanada/gramophone/service/QueueManager.java b/app/src/main/java/com/dkanada/gramophone/service/QueueManager.java
index 5604e20e..3ddedf1b 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/QueueManager.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/QueueManager.java
@@ -208,7 +208,7 @@ public class QueueManager {
         callbacks.onQueueChanged();
     }
 
-    // FixMe: Remove static MusicPlayerRemote call, idk how...
+    // FIXME This will be refactored and removed in a subsequent PR
     private void reposition(int deletedPosition) {
         int currentPosition = getPosition();
         if (deletedPosition < currentPosition) {