Fix a few issues with populate_sdk