Minor structure modifications