Bug fixes march 25