Fix remining two unused variable issues that prevented compilation on Ubuntu