More &amp; fixes