Minor fixes on classic view