Fix minor issue and polish