Fixes to dimensions