Loosened up requirements on some functions where number of parameters changed