diff --git a/Makefile.in b/Makefile.in
index cf56f86..76351d9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,7 +23,8 @@ clean:
 	rm $(OBJECTS) $(EXECUTABLE)
 
 install:
-	install include/* /usr/include/tins/
+	install -d /usr/include/tins/
+	install -t /usr/include/tins/ include/*
 	install $(EXECUTABLE) /usr/lib/
 
 uninstall:
diff --git a/src/ip.cpp b/src/ip.cpp
index e70f986..aa80478 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -261,7 +261,7 @@ void Tins::IP::set_option(uint8_t copied,
 
 const Tins::IP::IPOption *Tins::IP::search_option(OptionClass opt_class, Option opt_number) const {
     for(std::list<IPOption>::const_iterator it = _ip_options.begin(); it != _ip_options.end(); ++it) {
-        if(it->type.op_class == opt_class && it->type.number == opt_number)
+        if(it->type.op_class == (uint8_t)opt_class && it->type.number == (uint8_t)opt_number)
             return &(*it);
     }
     return 0;