Ten minutes of fixes