Polished some issues