diff --git a/.travis.yml b/.travis.yml
index b16ae359..afc79f6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,6 +72,10 @@ matrix:
       compiler: clang
 before_install:
   - eval "${MATRIX_EVAL}"
-script:
+  - if [ "$TRAVIS_OS_NAME" == 'osx' ]; then brew update; brew install git-lfs; fi
+before_script:
   - git submodule update --init --recursive
+  - git lfs install
+  - git lfs pull
+script:
   - ./scripts/build_all.sh
diff --git a/headers/enduro2d/core/render.hpp b/headers/enduro2d/core/render.hpp
index e270495e..7c5736ea 100644
--- a/headers/enduro2d/core/render.hpp
+++ b/headers/enduro2d/core/render.hpp
@@ -40,20 +40,20 @@ namespace e2d
         public:
             index_type type = index_type::unsigned_short;
         public:
-            index_info() noexcept;
-            ~index_info() noexcept;
+            index_info() = default;
+            ~index_info() noexcept = default;
 
-            index_info(const index_info&) noexcept;
-            index_info& operator=(const index_info&) noexcept;
+            index_info(const index_info&) noexcept = default;
+            index_info& operator=(const index_info&) noexcept = default;
 
             explicit index_info(index_type type) noexcept;
         };
     public:
-        index_declaration() noexcept;
-        ~index_declaration() noexcept;
+        index_declaration() = default;
+        ~index_declaration() noexcept = default;
 
-        index_declaration(const index_declaration&) noexcept;
-        index_declaration& operator=(const index_declaration&) noexcept;
+        index_declaration(const index_declaration&) noexcept = default;
+        index_declaration& operator=(const index_declaration&) noexcept = default;
 
         explicit index_declaration(index_type index_type) noexcept;
 
@@ -99,11 +99,11 @@ namespace e2d
             attribute_type type = attribute_type::floating_point;
             bool normalized = false;
         public:
-            attribute_info() noexcept;
-            ~attribute_info() noexcept;
+            attribute_info() = default;
+            ~attribute_info() noexcept = default;
 
-            attribute_info(const attribute_info&) noexcept;
-            attribute_info& operator=(const attribute_info&) noexcept;
+            attribute_info(const attribute_info&) noexcept = default;
+            attribute_info& operator=(const attribute_info&) noexcept = default;
 
             attribute_info(
                 std::size_t stride,
@@ -116,11 +116,11 @@ namespace e2d
             std::size_t row_size() const noexcept;
         };
     public:
-        vertex_declaration() noexcept;
-        ~vertex_declaration() noexcept;
+        vertex_declaration() = default;
+        ~vertex_declaration() noexcept = default;
 
-        vertex_declaration(const vertex_declaration&) noexcept;
-        vertex_declaration& operator=(const vertex_declaration&) noexcept;
+        vertex_declaration(const vertex_declaration&) noexcept = default;
+        vertex_declaration& operator=(const vertex_declaration&) noexcept = default;
 
         template < typename T >
         vertex_declaration& add_attribute(str_hash name) noexcept;
@@ -315,10 +315,10 @@ namespace e2d
         enum class blending_color_mask : u8 {
             none = 0,
 
-            r = (u8(1) << u8(0)),
-            g = (u8(1) << u8(1)),
-            b = (u8(1) << u8(2)),
-            a = (u8(1) << u8(3)),
+            r = (1 << 0),
+            g = (1 << 1),
+            b = (1 << 2),
+            a = (1 << 3),
 
             rg = r | g,
             rb = r | b,
@@ -507,14 +507,11 @@ namespace e2d
 
         class property_block final {
         public:
-            property_block() noexcept;
-            ~property_block() noexcept;
+            property_block() = default;
+            ~property_block() noexcept = default;
 
-            property_block(property_block&&) noexcept;
-            property_block& operator=(property_block&&) noexcept;
-
-            property_block(const property_block&);
-            property_block& operator=(const property_block&);
+            property_block(const property_block&) = default;
+            property_block& operator=(const property_block&) = default;
 
             property_block& clear() noexcept;
             property_block& merge(const property_block& pb);
diff --git a/headers/enduro2d/utils/strings.inl b/headers/enduro2d/utils/strings.inl
index b5854a47..46bfbedd 100644
--- a/headers/enduro2d/utils/strings.inl
+++ b/headers/enduro2d/utils/strings.inl
@@ -154,7 +154,6 @@ namespace e2d
             }
         } catch (...) {
             E2D_ASSERT_MSG(false, "basic_string_hash: unexpected debug exception");
-            throw;
         }
     #else
         E2D_UNUSED(hash, str);
diff --git a/modules/catch2 b/modules/catch2
index 9e1bdca4..e1307016 160000
--- a/modules/catch2
+++ b/modules/catch2
@@ -1 +1 @@
-Subproject commit 9e1bdca4667295fcb16265eae00efa8423f07007
+Subproject commit e1307016f05dac81f46b202576fc10bab795f29f
diff --git a/modules/utfcpp b/modules/utfcpp
index 60c490b8..0a238813 160000
--- a/modules/utfcpp
+++ b/modules/utfcpp
@@ -1 +1 @@
-Subproject commit 60c490b89fadc8f4e8dc0497500348572aee4b18
+Subproject commit 0a238813416e0ac8ea998b8814f00611a00f0735
diff --git a/sources/enduro2d/core/render.cpp b/sources/enduro2d/core/render.cpp
index 6c1940e0..a8de7179 100644
--- a/sources/enduro2d/core/render.cpp
+++ b/sources/enduro2d/core/render.cpp
@@ -44,14 +44,6 @@ namespace e2d
     // index_declaration::index_info
     //
 
-    index_declaration::index_info::index_info() noexcept = default;
-    index_declaration::index_info::~index_info() noexcept = default;
-
-    index_declaration::index_info::index_info(
-        const index_info&) noexcept = default;
-    index_declaration::index_info& index_declaration::index_info::operator=(
-        const index_info&) noexcept = default;
-
     index_declaration::index_info::index_info(index_type ntype) noexcept
     : type(ntype) {}
 
@@ -59,14 +51,6 @@ namespace e2d
     // index_declaration
     //
 
-    index_declaration::index_declaration() noexcept = default;
-    index_declaration::~index_declaration() noexcept = default;
-
-    index_declaration::index_declaration(
-        const index_declaration&) noexcept = default;
-    index_declaration& index_declaration::operator=(
-        const index_declaration&) noexcept = default;
-
     index_declaration::index_declaration(index_type type) noexcept
     : index_(type) {}
 
@@ -105,14 +89,6 @@ namespace e2d
     // vertex_declaration::attribute_info
     //
 
-    vertex_declaration::attribute_info::attribute_info() noexcept = default;
-    vertex_declaration::attribute_info::~attribute_info() noexcept = default;
-
-    vertex_declaration::attribute_info::attribute_info(
-        const attribute_info&) noexcept = default;
-    vertex_declaration::attribute_info& vertex_declaration::attribute_info::operator=(
-        const attribute_info&) noexcept = default;
-
     vertex_declaration::attribute_info::attribute_info(
         std::size_t nstride,
         str_hash nname,
@@ -135,14 +111,6 @@ namespace e2d
     // vertex_declaration
     //
 
-    vertex_declaration::vertex_declaration() noexcept = default;
-    vertex_declaration::~vertex_declaration() noexcept = default;
-
-    vertex_declaration::vertex_declaration(
-        const vertex_declaration&) noexcept  = default;
-    vertex_declaration& vertex_declaration::operator=(
-        const vertex_declaration&) noexcept  = default;
-
     vertex_declaration& vertex_declaration::normalized() noexcept {
         E2D_ASSERT(attribute_count_ > 0);
         attributes_[attribute_count_ - 1].normalized = true;
@@ -521,15 +489,6 @@ namespace e2d
     // render::property_block
     //
 
-    render::property_block::property_block() noexcept = default;
-    render::property_block::~property_block() noexcept = default;
-
-    render::property_block::property_block(property_block&&) noexcept = default;
-    render::property_block& render::property_block::operator=(property_block&&) noexcept = default;
-
-    render::property_block::property_block(const property_block&) = default;
-    render::property_block& render::property_block::operator=(const property_block&) = default;
-
     render::property_block& render::property_block::clear() noexcept {
         properties_.clear();
         samplers_.clear();