Quick fix of all obvious show-stoppers