25 Work fixes