All the hurried fixes