cleanup some issues