Fixign a few issues