Fixed firebugs