Fixing errors introduced by silencing unused arguments warning