Fixes made for TP3 presentation.