errors and issues resolved in