diff --git a/arm_compute/runtime/FunctionDescriptors.h b/arm_compute/runtime/FunctionDescriptors.h
index d523c56..3706d08 100644
--- a/arm_compute/runtime/FunctionDescriptors.h
+++ b/arm_compute/runtime/FunctionDescriptors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 ARM Limited.
+ * Copyright (c) 2019-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -44,8 +44,9 @@
 /** Descriptor used by the FFT2D function */
 struct FFT2DInfo
 {
-    std::pair<unsigned int, unsigned int> axes{ 0, 1 }; /**< Axes to run on. If same, multiple transforms are performed on single axis*/
-    FFTDirection direction{ FFTDirection::Forward };    /**< Direction of the FFT. */
+    unsigned int axis0{ 0 };                         /**< Axis to run first pass on. If same, multiple transforms are performed on single axis*/
+    unsigned int axis1{ 1 };                         /**< Axis to run second pass on. If same, multiple transforms are performed on single axis*/
+    FFTDirection direction{ FFTDirection::Forward }; /**< Direction of the FFT. */
 };
 } // namespace arm_compute
 #endif /* ARM_COMPUTE_RUNTIME_FUNCTION_DESCRIPTORS_H */
diff --git a/arm_compute/runtime/MemoryGroup.h b/arm_compute/runtime/MemoryGroup.h
index ba1dbc0..4d48495 100644
--- a/arm_compute/runtime/MemoryGroup.h
+++ b/arm_compute/runtime/MemoryGroup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 ARM Limited.
+ * Copyright (c) 2017-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -44,9 +44,7 @@
 {
 public:
     /** Default Constructor */
-    MemoryGroup(IMemoryManager *memory_manager);
-    /** Default Constructor */
-    MemoryGroup(std::shared_ptr<IMemoryManager> = nullptr);
+    MemoryGroup(std::shared_ptr<IMemoryManager> = nullptr) noexcept;
     /** Default destructor */
     ~MemoryGroup() = default;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
@@ -71,8 +69,10 @@
     MemoryMappings                  _mappings;       /**< Memory mappings of the group */
 };
 
-inline MemoryGroup::MemoryGroup(std::shared_ptr<IMemoryManager> memory_manager)
-    : _memory_manager(memory_manager), _pool(nullptr), _mappings()
+inline MemoryGroup::MemoryGroup(std::shared_ptr<IMemoryManager> memory_manager) noexcept
+    : _memory_manager(memory_manager),
+      _pool(nullptr),
+      _mappings()
 {
 }