Small issues resolved