diff --git a/parser.cpp b/parser.cpp
index a70ca37c1..3e95ee8e9 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -2344,10 +2344,10 @@ void parser_t::eval_job( tokenizer *tok )
 			{
 				if( job_start_pos < tok_get_pos( tok ) )
 				{
-					int stop_pos = tok_get_pos( tok );
+					long stop_pos = tok_get_pos( tok );
 					const wchar_t *newline = wcschr(tok_string(tok)+start_pos, L'\n');
 					if( newline )
-						stop_pos = mini( stop_pos, newline - tok_string(tok) );
+						stop_pos = mini<long>( stop_pos, newline - tok_string(tok) );
 
 					j->set_command(wcstring(tok_string(tok)+start_pos, stop_pos-start_pos));
 				}
diff --git a/reader.cpp b/reader.cpp
index 39e74a85c..39c0b984d 100644
--- a/reader.cpp
+++ b/reader.cpp
@@ -2744,7 +2744,7 @@ const wchar_t *reader_readline()
 					if( *begin == L'\n' )
 						begin++;
 					
-					size_t len = maxi( end-begin, 1 );
+					size_t len = maxi<size_t>( end-begin, 1 );
 					begin = end - len;
                     
 					reader_kill( begin - buff, len, KILL_PREPEND, last_char!=R_BACKWARD_KILL_LINE );
@@ -2767,7 +2767,7 @@ const wchar_t *reader_readline()
 				if( *begin == L'\n' )
 					begin++;
 				
-				len = maxi( end-begin, 0 );
+				len = maxi<size_t>( end-begin, 0 );
 				begin = end - len;
                 
 				while( *end && *end != L'\n' )