Small fixes as user show