Fixing unused variable compiler warnings