Dimension changes and minor fixes