Rebuild to fix a few issues