Clean up of issues, WIP