Fixed various argument exceptions to include relevant variable as first parameter