Fixed up a few issues