Minor updates to improve flattening of components
Update to v0.9.5.2