actually added fixes mentioned earlier