three fixes