Critical fixes :(