Some debugging code and association list fix