PDF Generator bugs resolved