diff --git a/sol/proxy.hpp b/sol/proxy.hpp
index bd7a083b..aa0d6129 100644
--- a/sol/proxy.hpp
+++ b/sol/proxy.hpp
@@ -64,35 +64,39 @@ public:
 		tbl.set( key, std::forward<U>( other ) );
 	}
 
-	operator nil_t ( ) {
+	operator nil_t ( ) const {
 		return get<nil_t>( );
 	}
 
-	operator bool( ) {
-		return get<bool>( );
-	}
-
-	operator std::string( ) {
-		return get<std::string>( );
-	}
-
-	operator object( ) {
+	operator object( ) const {
 		return get<object>( );
 	}
 
-	operator function( ) {
+	operator function( ) const {
 		return get<function>( );
 	}
 
-	operator double( ) {
+	operator std::string( ) const {
+		return get<std::string>( );
+	}
+
+	template <typename T = void>
+	operator bool( ) const {
+		return get<bool>( );
+	}
+
+	template <typename T = void>
+	operator double( ) const {
 		return get<double>( );
 	}
 
-	operator float( ) {
+	template <typename T = void>
+	operator float( ) const {
 		return get<float>( );
 	}
 
-	operator int( ) {
+	template <typename T = void>
+	operator int( ) const {
 		return get<int>( );
 	}
 
@@ -103,23 +107,23 @@ public:
 };
 
 template <typename Table, typename Key, typename T>
-bool operator== ( T&& left, const proxy<Table, Key>& right ) {
-	return right.get<Decay<T>>( ) == left;
+inline bool operator== ( T&& left, const proxy<Table, Key>& right ) {
+	return left == right.template get<Decay<T>>( );
 }
 
 template <typename Table, typename Key, typename T>
-bool operator== ( const proxy<Table, Key>& right, T&& left ) {
-	return right.get<Decay<T>>( ) == left;
+inline bool operator== ( const proxy<Table, Key>& right, T&& left ) {
+	return right.template get<Decay<T>>( ) == left;
 }
 
 template <typename Table, typename Key, typename T>
-bool operator!= ( T&& left, const proxy<Table, Key>& right ) {
-	return right.get<Decay<T>>( ) != left;
+inline bool operator!= ( T&& left, const proxy<Table, Key>& right ) {
+	return right.template get<Decay<T>>( ) != left;
 }
 
 template <typename Table, typename Key, typename T>
-bool operator!= ( const proxy<Table, Key>& right, T&& left ) {
-	return right.get<Decay<T>>( ) != left;
+inline bool operator!= ( const proxy<Table, Key>& right, T&& left ) {
+	return right.template get<Decay<T>>( ) != left;
 }
 
 } // sol
\ No newline at end of file
diff --git a/tests.cpp b/tests.cpp
index 355a9546..3a40f181 100644
--- a/tests.cpp
+++ b/tests.cpp
@@ -285,6 +285,7 @@ TEST_CASE("tables/operator[]", "Check if operator[] retrieval and setting works
     REQUIRE(bar == "hello world");
     REQUIRE(foo == 20);
     // test operator= for stringification
+    // errors due to ambiguous operators
     bar = lua["bar"];
 
     // basic setting
@@ -300,7 +301,7 @@ TEST_CASE("tables/operator[]", "Check if operator[] retrieval and setting works
     REQUIRE_NOTHROW(lua.script("assert(test(10, 11, \"hello\") == 11)"));
 
     // function retrieval
-    sol::function test = lua["test"];
+    sol::function test = lua[ "test" ];
     REQUIRE(test.call<int>(10, 11, "hello") == 11);
 
     // setting a lambda
@@ -311,15 +312,15 @@ TEST_CASE("tables/operator[]", "Check if operator[] retrieval and setting works
     REQUIRE_NOTHROW(lua.script("assert(lamb(220) == 440)"));
 
     // function retrieval of a lambda
-    sol::function lamb = lua["lamb"];
+    sol::function lamb;// = lua[ "lamb" ];
     REQUIRE(lamb.call<int>(220) == 440);
 
     // test const table retrieval
     auto assert1 = [](const sol::table& t) {
         std::string a = t["foo"];
-        int b = t["bar"];
+	   int b = t["bar"];
         std::cout << a << ',' << b << '\n';
     };
 
     REQUIRE_NOTHROW(assert1(lua.global_table()));
-}
\ No newline at end of file
+}