diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 45aa1bc..c12d35b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="eu.worn.apps.androvac">
 
+    <uses-permission android:name="android.permission.TRANSMIT_IR" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -18,6 +20,4 @@
         </activity>
     </application>
 
-    <uses-permission android:name="android.permission.TRANSMIT_IR" />
-
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/eu/worn/apps/androvac/AndroidIRBeamer.java b/app/src/main/java/eu/worn/apps/androvac/AndroidIRBeamer.java
index 2352a6f..c77acb6 100644
--- a/app/src/main/java/eu/worn/apps/androvac/AndroidIRBeamer.java
+++ b/app/src/main/java/eu/worn/apps/androvac/AndroidIRBeamer.java
@@ -9,7 +9,7 @@ public class AndroidIRBeamer implements IRBeamer {
 
     public AndroidIRBeamer(Activity act) {
         Context ctx = act.getApplicationContext();
-        cim = (ConsumerIrManager) ctx.getSystemService(ctx.CONSUMER_IR_SERVICE);
+        cim = (ConsumerIrManager) ctx.getSystemService(Context.CONSUMER_IR_SERVICE);
     }
 
     public boolean isAvailable() { return cim.hasIrEmitter(); }
diff --git a/app/src/main/java/eu/worn/apps/androvac/RoboVac11sRemote.java b/app/src/main/java/eu/worn/apps/androvac/RoboVac11sRemote.java
index 82c3f07..2313551 100644
--- a/app/src/main/java/eu/worn/apps/androvac/RoboVac11sRemote.java
+++ b/app/src/main/java/eu/worn/apps/androvac/RoboVac11sRemote.java
@@ -5,7 +5,7 @@ import java.util.Calendar;
 public class RoboVac11sRemote {
     public IRModulation modulation = new EufyIRModulation();
 
-    private Calendar schedule = null;
+    private Calendar schedule;
 
     private byte[] buildMessage(byte command) {
         byte msg[] = new byte[6];