removed two further warnings