diff --git a/elab_expr.cc b/elab_expr.cc
index eae0a0df5..14038e0f3 100644
--- a/elab_expr.cc
+++ b/elab_expr.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2016 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2018 Stephen Williams (steve@icarus.com)
  * Copyright CERN 2013 / Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
@@ -1446,6 +1446,13 @@ NetExpr* PECallFunction::elaborate_sfunc_(Design*des, NetScope*scope,
 		  return 0;
 	    }
 
+            if (!type_is_vectorable(expr_type_)) {
+	          cerr << get_fileline() << ": error: The argument to "
+		       << name << " must be a vector type." << endl;
+	          des->errors += 1;
+	          return 0;
+            }
+
 	    if (debug_elaborate) {
 		  cerr << get_fileline() << ": PECallFunction::elaborate_sfunc_: "
 		       << name << " expression is the argument cast to expr_wid=" << expr_wid << endl;
diff --git a/vhdlpp/std_funcs.cc b/vhdlpp/std_funcs.cc
index ec843dd13..89448e483 100644
--- a/vhdlpp/std_funcs.cc
+++ b/vhdlpp/std_funcs.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright CERN 2015
+ * Copyright CERN 2016-2018
  * @author Maciej Suminski (maciej.suminski@cern.ch)
  *
  *    This source code is free software; you can redistribute it
@@ -120,7 +120,7 @@ void preload_std_funcs(void)
     std::list<InterfacePort*>*fn_integer_args = new std::list<InterfacePort*>();
     fn_integer_args->push_back(new InterfacePort(&primitive_INTEGER));
     fn_integer = new SubprogramBuiltin(perm_string::literal("integer"),
-                                           perm_string::literal("$signed"),
+                                           perm_string::literal("int'"),
                                            fn_integer_args, &primitive_INTEGER);
     std_subprograms[fn_integer->name()] = fn_integer;