A few issues resolved