Most issues resolved