Critical fixes