Fixed a few issue

Fixed a few issues