fixed a few issues on our build