Fixed a few issues
1.4.2