Fixing lovely bugs