Push debug fixes