Some issues resolved