Bug fix night!