fixes some issues