Cleaning some issues