rich fixes