Fix some unused variable warnings