Made to compile with more recent Arduino versions