Added option to automatically fix basic problems