Fixed issues

Outstanding issues