Fixes assorted func errors