Cleaning up possible problems