fix a few issues with new structure